tree fbf9a05e741eaa3381cc78d47c1a5b5df5a0343b
parent 1d21f39fef124094c44145dda4978dabc25bb29a
parent 9ead5a3c056761a54ea068e67134db5f2776bdd3
author Jordan Jozwiak <jjoz@google.com> 1591979563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591979563 +0000

DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05

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

Change-Id: Ib5e4bb9400789f5666cd5b8d466afdd89f76e724