[automerger skipped] Merge "Verify ringtone from ringtone picker is audio"...

[automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e -s ours am: c0e620bf -s ours

am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219302



Change-Id: Id740836c3760db26c671a692f38c1c7fc4dd61a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>