[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: 95346be8 am: f76aeb3d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2445bce447448e7f4c5f5575cdb445d6a64bcadf