Merge "Merge "Fix CtsDevicePolicyManagerTestCases not to rely on default ringtone" into pie-cts-dev am: d96fa78b19"