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 am: d21710f8

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



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