Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb am:...

Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb am: 8f8b11bc" into tm-d1-dev-plus-aosp am: d66473c3

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



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