[automerger skipped] [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 am: 1e0cf0c900 am: 1bb9fbbac3 am: fa4fe98e0e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011 Change-Id: I102ec7325935a6b4fa1033f5f64982b33364a9f0
This commit is contained in: