DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: a50847e505 am: d140dfb3ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858 Change-Id: I422bcf6f5f8f1fed53e72fd93a75375cd3c0c425
This commit is contained in: