Merge changes from topic "am-918a670c3ae047558e91f2ceae7f0051"

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-48306752669a47cd8b4809ed762bff75" into sc-v2-dev-plus-aosp am: f552a742 -s ours am: fd42c444 -s ours am: 00f4e708 -s ours
  [automerger skipped] [automerge] Revert "Fixes cannot leave dozing when dismiss keyguard" 2p: 0063c248 am: ac41cf4f -s ours am: 594fc9d6 -s ours am: 4143a29d -s ours