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

[automerger skipped] Merge "Resolve cross account user ringtone validation." into udc-dev am: ffa00768 am: 4a820201 -s ours am: 67218ade -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: I6519ba24e7de05631e1f3eb1b0008a71a253a6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>