Merge "Better diags when Launcher is manipulated on the locked phone" into sc-dev am: 0d51bc3caa am: 8d09440265

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

Change-Id: I494d30ed4ec862dcb1f2f611a781722ce4120c95