Merge "Move the lock to the individual app restriction setting's dump" into tm-dev am: de24bcd6 am: 10d79f96

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

Change-Id: I6a3534601e84717772e396b6a49e35071b17c738