[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: 452d7391a7 am: 25637b523a -s ours am: 170c66cbe7 -s ours
am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 ef7b1333f0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12287404
Change-Id: Ia5e53e2602b29e6c78ae4743a9a921a448fcb3b9
This commit is contained in: