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

[automerger skipped] Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26b am: 2ea55003 am: 07a72155 am: 682944b4 am: dda07ea9 am: 8ca5dd90 am: 2adbfb4d -s ours am: d7d80d17 -s ours

am skip reason: Merged-In Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7 with SHA-1 f9d8d494 is already in history

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



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