Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
am: dc4104be6d
am: da6cf3046a
am: dd1d516607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506 Change-Id: I5251edda1cab2db33e59409aba8ff5eed02a4e0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: