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

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



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