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: Ifbc83faeea42d00da7c011f54938fee645980ba1