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

[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-dev am: 0e3093b2 -s ours am: a810c47b -s ours am: 964e3b62 -s ours am: 2cc01d25 -s ours am: 89d00273 -s ours am: 07a20cf6 -s ours

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

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



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