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

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

Change-Id: Icda0324952530680318cee6892680b146615c927