Merge "Add a device config about moving abusive apps to restricted level" into...

Merge "Add a device config about moving abusive apps to restricted level" into tm-dev am: 300599c6 am: 8ea09249

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



Change-Id: I6fce00b9c59be11414813300cea0d9adfde280f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>