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

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

Change-Id: I736284f5a829bbe889e94d6236e51179e795ede1