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

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

Change-Id: I645435e500b00cad65f9a45813202794f25d2fef