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

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

Change-Id: I3d745f628323205bf02e43485882c6f78ce0400b