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

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

Change-Id: Ie25acb1ea04d90bca3b69becbf22496d40cca00b