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

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

Change-Id: I916301f82e16ebed7b8e324c3108a0d3cf7c13e7