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

am skip reason: subject contains skip directive

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

Change-Id: I3f5971d5264b31cb799487399f35ef0c13098e5b