Merge "Fix to allow setting URI without recreating ringtone" into tm-qpr-dev...

Merge "Fix to allow setting URI without recreating ringtone" into tm-qpr-dev am: 6170285a am: e7eef125

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



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