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: Ib7fb6363360d8f46512d3353eefb2ee8d4218be3