Merge "[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c013779 am: c0f911ce -s ours am: f3c3d9fa -s ours" into rvc-qpr-dev-plus-aosp