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

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

Change-Id: I5359b00e2068c7e617f0358b2e485a3a2c215139