[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: 5756ae94 am: 3c38b25d am: 79f36b55 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8e6f20e0030180c62dbd95ad10f8cde3327ca4cd