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

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

Change-Id: I2bd4b73a5813f9dba7f821617d2d93a371e8cc9c