[automerger skipped] Merge "Revert "[DO NOT MERGE] Keyguard was hiding...

[automerger skipped] Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev am: e197b35d am: ee83f6df -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145222

Change-Id: I39843ebc2ee6861ef7117155bfa59f4d0dbe1f1a