Merge changes from topic "am-af3d87b9c3b747319cad3033a946b659" into main

* changes:
  [automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -s ours am: 8ba21792 -s ours am: f72e484d -s ours am: 790fbfb3 -s ours am: 8dd736d3 -s ours am: f4f4929a -s ours am: a8c8808a -s ours am: 3fcc68b0 -s ours am: 04f114e5 -s ours
  [automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -s ours am: ea9e51e3 -s ours am: 620b89a8 -s ours am: 7c2f597c -s ours am: 511dee95 -s ours am: af0c9c23 -s ours am: 9aab2e9f -s ours am: 8a68b03e -s ours am: 68b9e061 -s ours