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

[automerger skipped] Merge "Resolve cross account user ringtone validation." into udc-dev am: ffa00768 am: 58d79640 -s ours

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

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



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