[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 skip reason: subject contains skip directive

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

Change-Id: Id47f6b2a53476607472366e20aee4a0abfa3a4e8