Merge "[SettingsProvider] update ringtone cache only after setting is update"...

Merge "[SettingsProvider] update ringtone cache only after setting is update" into udc-qpr-dev am: 30ecbce9

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



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