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

[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-qpr-dev am: 6ce832b6 -s ours am: 53b2ef02 -s ours am: 71f02e79 -s ours am: 31f54e3c -s ours am: 782296ba -s ours am: eedbce14 -s ours

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

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



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