[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: e6135eeb89
-s ours am: eb1d86b66b
-s ours am: b356e927d8
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598 Change-Id: I0b8a27fc2a6ddc0a2952a005d20d4e878aee7ebc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: