[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: Ibe90e6f01d4e677c41ac3ab68fa5834550b278dc