Merge "Improving diags for launching an app." into sc-v2-dev am: 8a4a99ed95 am: 1814e61c01

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

Change-Id: Ia03f832669c039e480e9f0ce14272e78e7db56e1