[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Require permission to...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb8 am: f9c533aa am: 4fc13f34 am: 7efa36df -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: I0c332bd9e9a1b99319e775afaa323745a7c5070a