[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: 609029c5 -s ours

am skip reason: Merged-In Iaa2a0e1be882b1fe479241f5dda32b0704749001 with SHA-1 208ec3ef is already in history

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



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