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

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

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



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