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

[automerger skipped] [automerge] Revert "[DO NOT MERGE] Keyguard was hiding occluding activities" 2p: d7fe1842 am: ab821716 -s ours am: 1b09eaee -s ours

am skip reason: subject contains skip directive

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

Change-Id: If80d7606869088dd3e5c449e56b0882d303f65a6