[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio"...

[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-dev am: 9fef491b -s ours am: 9e995f55 -s ours am: 0404c24f -s ours am: f183fcb0 -s ours am: 4ceb826e -s ours am: 36ae571b -s ours am: 78344243 -s ours

am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 30c9b4ef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027119



Change-Id: I6a1bc6e4d500b30cd7572c4eedc8861593829c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>