[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is...

[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60 am: 3d9bdda6 -s ours am: ec921eea -s ours am: f0065e3a -s ours am: 09c382d8 -s ours am: 4daf3122 -s ours am: a1bc77f4 -s ours

am skip reason: subject contains skip directive

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



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