tree 62e89bf70f22a6cf82b355c20208cc19c46b43f8
parent fa4fe98e0e7dcf3c59d5756420736194ec032204
parent 93a785bd6b25ba2c5f58c5624e68fbdfcb5b519f
author TreeHugger Robot <treehugger-gerrit@google.com> 1602878040 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602878040 +0000

Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 2f7396440e am: 93a785bd6b

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

Change-Id: Iadfbf134bdc348c48a0d7ef98277925458b72d9a