Merge "Persist bypassDevicePolicyMmanagementRoleQualification in global...

Merge "Persist bypassDevicePolicyMmanagementRoleQualification in global setting" into tm-dev am: bc161600 am: 81558fb0

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



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