Merge changes from topic "am-93433cfaa1dd459d86d59ba5a0437447" into rvc-d1-dev-plus-aosp

* changes:
  Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: 2804a393e2
  [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: a2049f590a