Merge "[SettingsProvider] clear binder identity when updating the ringtone cache" into udc-qpr-dev