[automerger skipped] Merge "[SettingsProvider] update ringtone cache only...

[automerger skipped] Merge "[SettingsProvider] update ringtone cache only after setting is update" into udc-qpr-dev am: 30ecbce9 am: 9683ffcf -s ours

am skip reason: Merged-In I63ce56ef0cbfb8862ffbb56d7137a0f0223110a2 with SHA-1 cc0de51a is already in history

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



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