[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-qpr-dev am: 6ce832b646 -s ours am: 53b2ef023e -s ours am: 71f02e796a -s ours am: 31f54e3cb4 -s ours am: 782296ba35 -s ours am: e13f7e2d20 -s ours am: 339b0bd168 -s ours am: d3122bfe10 -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 a67982c990 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027348
Change-Id: Ifdb70a1a6af9bd76c00b5050498a8414076728c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: