[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: a50847e5 am: d140dfb3 am: 45701de9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8006b49a1566425edcb7775cb8e4695bf9262f1