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

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

Change-Id: I6f47df587eb9a59166013de8ad4019ae471df672