Merge "Resolve cross account user ringtone validation." into udc-dev am: ffa00768

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



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