[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 45d83c2145 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011 Change-Id: I36519036f681d46d889c6bfff5c82ae900fbe166
This commit is contained in: