Merge "Avoid duplicate ringtone load" into tm-qpr-dev am: 40da40a9 am: a4b1842e

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



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