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

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

Change-Id: I0fd8b8fa83c874edbee446fcf47d479b4345bd5c