Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655c am: 5756ae94

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

Change-Id: I852cd55e4769167beff603f4a6b0e7b0005944df