Merge "Properly restart ringtone when BT device connected" into rvc-dev am: 60d43359 am: 816799cf am: 82913d96

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

Change-Id: Ic69784c6b405fff21e342a9837a666deba210f4c