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

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

Change-Id: Ie77075e8175c83c24e53f80152f898be119406ea