Merge "Don't call startRinging twice" into rvc-dev am: 3fc1c56c91 am: d3f4152846

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

Change-Id: I08d24760806fdc531c84a491581cac231587980c