[automerger skipped] Merge "[DO NOT MERGE] Fix CtsDevicePolicyManagerTestCases not to rely on default ringtone" into oreo-mr1-cts-dev am: ed358f6cd1 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1487539

Change-Id: Ie068bb30aae6df4c9bcda62a239bee1de584887b