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

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

Change-Id: Ifd628c4df89c2fdb2bbbf069ccda11a0677b1713