[automerger skipped] [automerge] [DO NOT MERGE] Keyguard was hiding occluding activities 2p: 267ecd15 am: 5ea88117 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I99243bfabae79f14470a595f7e5d372346ee3b80