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

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

Change-Id: I4f06e189670dcfbc403437ad8d823e8b63ea75c6