[automerger skipped] Merge "Fix inconsistency in ringtone list" into sc-dev am: 49be55d145 am: dcdabceaf0 -s ours
am skip reason: Merged-In I8fc3e936fe89308d4697eda42088e4fd533ce47c with SHA-1 1903501380 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965492
Change-Id: If4c907ff5c10e0c779033061fa6a41819f9e3496
This commit is contained in: