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: Id8470881ca99c989713572f635b0ffc2236b3747