tree cfa9e077e0b0148992e42173225e1c11ab906f23
parent 7d48d460c0860ff4a5317533533fbb5f63964fb2
parent a50847e50512a265c7af3ad9e14b0d80f8c4fd06
author Jordan Jozwiak <jjoz@google.com> 1591980328 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591980328 +0000

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

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

Change-Id: I971be58e4d2a2b6e53b1b8c07b4f6f59dffbe12e