[automerger skipped] DO NOT MERGE - Allow locking with feature or permission...

[automerger skipped] DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c am: 1c71776f am: 412d74f4 am: a4de5f07 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I54764316d15fa51ef66dec85b44fe53a0b09e8e6