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

[automerger skipped] Merge "Require permission to create trusted displays" into rvc-qpr-dev am: c2b395c7 am: 3df1e778 -s ours

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

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

Change-Id: Icdaa9f2566c725ef4eefc7e6a430c73d97829ca1