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

Merge "[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c013779 am: c0f911ce -s ours am: f3c3d9fa -s ours" into rvc-qpr-dev-plus-aosp am: 89dc04ff -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: Icba5b7f3283e74a78760e5d98b2598195e0bb286