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: 83dd8773

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



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