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

[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into tm-dev am: 763762e2 am: fea55211 -s ours

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

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



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