tree 09bbbe647cf90aad786d5cd74f4b878806a2921b
parent 6daefe734e0aefd34ac10db9b0826e662e206fbe
parent 4fc13f3491a29d5af893691919c2e3350279c956
author Charles Chen <charlesccchen@google.com> 1601362481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601362481 +0000

Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 am: 4fc13f3491

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

Change-Id: I6d2cf2373e3be278d87c8abab59ce26ffb92c2a8