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

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

Change-Id: I29d43ec9406ae24b9e2bf3cc4cdffd234817eb16