[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into tm-dev am: 763762e2ec am: 57fdf138eb -s ours am: c3b8dafbfb -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 88f5aae54c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027430
Change-Id: Ie7bda14822ca9a3a18d45a487f1d8a60c8f8032c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: