Merge "Revert "Resolve cross account user ringtone validation."" into udc-dev am: 84a4532be3

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

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