[automerger skipped] Merge "[DO NOT MERGE] Keyguard was hiding occluding...

[automerger skipped] Merge "[DO NOT MERGE] Keyguard was hiding occluding activities" into sc-v2-dev am: 1774ba8a am: b0aeecc0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ieed050045d37e4ededb8e31111490be03a4db9a2