[automerger skipped] Implemement the media lookup for ringtone restore in...

[automerger skipped] Implemement the media lookup for ringtone restore in SettingsProvider. am: 452ffae8 am: 931ee10c -s ours

am skip reason: Merged-In Ib401f64e08a6297577672aea30a09b63f28dcf41 with SHA-1 a26e28d5 is already in history

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



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