[automerger skipped] Merge "Resolve cross account user ringtone validation."...

[automerger skipped] Merge "Resolve cross account user ringtone validation." into udc-qpr-dev am: 3c60361e -s ours

am skip reason: Merged-In Ie28e8d0890086caada561ed27dd660836e6aa6bb with SHA-1 1c7fbd70 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/31394145



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