Merge "Merge "Properly restart ringtone when BT device connected" into rvc-dev am: 60d43359 am: 09c03c40 am: 455380a4" into rvc-qpr-dev-plus-aosp am: af779108

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

Change-Id: I0c0464a16ab1b631670c0f1bc2f4cda5b791b6f5