Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev am: e197b35d

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

Change-Id: I277b768a02fd9738d61f93282e719f1185fb998a