[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE]...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4 am: 2f739644 am: 0e0b74cf am: b7ce802f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4b498bc68782ee879488395c9964b57ba838eb20