[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: cfbcc6dd -s ours am: e03d85be -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: I65be34873d7fc5c40ae6c161ce732d89a55e5a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>