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

[automerger skipped] Merge "Revert "Resolve cross account user ringtone validation."" into udc-dev am: 84a4532b am: 12ecffcf -s ours

am skip reason: Merged-In Ie28e8d0890086caada561ed27dd660836e6aa6bb with SHA-1 cfc855ba is already in history. Merged-In was found from reverted change.

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

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



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