Merge "Merge "Don't call startRinging twice" into rvc-dev am: 3fc1c56c91 am: 6c10ace36b" into rvc-d1-dev-plus-aosp am: c0441a9aaf

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

Change-Id: I692e1709db7129bd83cd4f7d07c7ca4f7e79dbc8