Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3 am: 03c9d79940
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413 Change-Id: Ib714e89611e10b8416e9c5db95422fe778b63394 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: