Merge changes from topic "am-8890be08bd9b4c77a6b9786a47fd66a9" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 am: 4fc13f3491
  [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: 6c079ef0b5 am: f0daa2119f