Merge "Merge "Don't call startRinging twice" into rvc-dev am: 3fc1c56c am: d3f41528 am: d49dc364" into rvc-qpr-dev-plus-aosp am: dcdd7d26

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

Change-Id: Ic7943c77bebcf471b5d33fe219506685637bca7d