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

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

Change-Id: I1e175c69167f34f53ca4dd2c1f190068c916244b