Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp

* changes:
  [automerge] [DO NOT MERGE] Keyguard was hiding occluding activities 2p: 267ecd151e
  [DO NOT MERGE] Keyguard was hiding occluding activities