[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: 2804a393 am: 3c5a186d am: b7c6009b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I722718cceaa69df68670be70a5ab4093123b707d