[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: b2c51be2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1df4df7beec0c5d65fd48bf5ba2fb458fae78ff5