Merge "Clearer diag for visible keyguard" into sc-dev am: 4a4eac8e6c

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

Change-Id: I412b60079b2f9dbfedda9a4d2c9ae8330b994841