Merge "Use a new lock for the app restriction level settings" into tm-dev am: e31ec794 am: b98900ee

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

Change-Id: I4b4a9d5a9ead09dee9cda7fd72e48fb5f4726d21