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

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

Change-Id: Idde486e8312491040457dd6026bc36760c651a82