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

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

Change-Id: Iec5d88d43b4f7fa82af48fe6d5e5e484b7a961c9