[automerger skipped] Merge "RingtoneManager: allow video ringtone URI" into...

[automerger skipped] Merge "RingtoneManager: allow video ringtone URI" into udc-qpr-dev am: 275ff2fe -s ours

am skip reason: Merged-In Id9b81e2db8314bc16df77d0a9221ce93143a8012 with SHA-1 525db8ea is already in history

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



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