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

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

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