Merge "Added missing tests on DeviceAdminAddPoliciesPreferenceControllerTest" into sc-dev