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

Change-Id: Icf7deaf337dec43aa5862555f5cb64f6a8201220