Merge "Settings: keep the old ringtine cache not delete when set failed." into main am: 5d97216d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3271477



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