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

[automerger skipped] Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655c am: 6f603712 am: fe4534b3 am: 8447fd12 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68b09c30c27e43810fd0fe7787eebe54e45e5272