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

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

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