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

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

Change-Id: If16d2f02cb2744f552ea3419e828e70ef5a8c9eb