[automerger skipped] Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26bf9 am: 2ea5500310 am: 07a72155ec am: 682944b45f am: 55a72076dd am: a1b392e6e5 -s ours am: a989f13978 -s ours

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

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

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