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

[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-qpr1-dev am: 51afe644 -s ours am: 36704e18 -s ours

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

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



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