Merge "Add/fix null-check on ringtoneSupplier." into udc-dev am: 29528d51 am: 739bd141

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



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