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

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

Change-Id: I2cda385fc6f9f0c7230c78eb541895bda769d556