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

[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-v2-dev am: e49a9b66 -s ours am: 9ea00329 -s ours am: 14256cb9 -s ours am: 24bfa272 -s ours am: 2354a870 -s ours am: 7885009f -s ours

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

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



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