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