[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: 55a72076 am: a1b392e6 -s ours am: a989f139 -s ours am: 570b833e -s ours

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

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



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