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

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

Change-Id: Ic686f819bf283ba1f66215c7ee77e198bce244e7