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

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

Change-Id: I26c2cf0f20680810d9fb8de744e4d754fa06d03b