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

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

Change-Id: I923dadee2709562f92e9124daedd8e5bfbf11e53