[automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when...

[automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57 am: 03dd4cc7 -s ours am: 719c5bf0 -s ours am: 74c53ed1 -s ours am: 04a9796b -s ours

am skip reason: subject contains skip directive

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



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