[automerger skipped] Merge "Fix inconsistency in ringtone list" into sc-dev...

[automerger skipped] Merge "Fix inconsistency in ringtone list" into sc-dev am: 49be55d1 -s ours am: 0633c361 -s ours

am skip reason: Merged-In I8fc3e936fe89308d4697eda42088e4fd533ce47c with SHA-1 d9b89825 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965492

Change-Id: Ib8bce607958cea8f5f53d842374028466a0dd26e