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

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

Change-Id: I28deddc08d8052f149d64e7f71808bedf5f1bf25