[automerger skipped] Merge "Require permission to create trusted displays"...

[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c013779 am: 452d7391 -s ours am: 854710d0 -s ours am: fa7b8d4a -s ours

am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 f21c885c is in history

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

Change-Id: Ia2d79a0104c8e4013b7cfdf1ad8ccd80555f751c