Merge changes from topic "am-051d3af580ca4b0f8f6af3ecafa9780b" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 2f7396440e am: 0e0b74cf63
  [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 am: 1e0cf0c900 am: 2fb8485fbb