Merge "Improving TAPL diagnostics" into sc-dev am: c5c0e5e96e am: 771e06250b

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

Change-Id: I4aa16acf2ce62fa5a19585f23023ffbcfa284216