[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into tm-dev am: 763762e2ec am: fea552116b -s ours am: 1e55410b8d -s ours am: 023907d337 -s ours am: b75804e66a -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: Ib14a74d3afd9151eea9748732b36f37f6971de18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: