DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b

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

Change-Id: I3f3e54e9d74a8b4ff6e843e014b2d226ebf1e44b