Merge "Adds more roles to the protectionlevel" into tm-dev am: b061e2e6 am:...

Merge "Adds more roles to the protectionlevel" into tm-dev am: b061e2e6 am: 8da2bf66 am: 1b843511

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



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