tree d5d8afda55ebbeb886aebc62d0e0bbc6706fac79
parent 3df1e7787aa382b48899b0a6165d9fb3b529ba03
parent 25637b523a1555dce1704de5a89cdeee150487fa
author TreeHugger Robot <treehugger-gerrit@google.com> 1599218051 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599218051 +0000

[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: 452d7391a7 am: 25637b523a -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: I13cfa2d7e33bc5a4d41726b0b871d889d78f033c