Merge "Improving TAPL messaging" into sc-dev am: 9a6ba8cfa4 am: b815ff8546 am: ae537f6e89

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

Change-Id: I68f5f12aa45781d7d003a510547db13e646012a6