Merge "Persist bypassDevicePolicyMmanagementRoleQualification in global setting" into tm-dev