Merge "Don't rely on intent to call back from activity tracker" into sc-dev am: 1b369c4763

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14909197

Change-Id: I2259802dfb1de1260e2cddb7b5ad59ad7f60d47f