[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-qpr1-dev am: 51afe64417 -s ours am: 36704e1854 -s ours am: cc68bc1f9f -s ours am: ff7524b912 -s ours am: 8c4f3f7a7f -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 0a4792b62e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027121
Change-Id: Icf7e4da372fc23e610960ff54e972c7edb1e8fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: