[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: 7d48d460 am: 1b5d7640 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib27c00dc247731cc0c21115b138598bc1eb28ffb