Merge "Merge "Don't call startRinging twice" into rvc-dev am: 3fc1c56c am: 6c10ace3" into rvc-d1-dev-plus-aosp am: c0441a9a am: 11ce3f03

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

Change-Id: I3e91e7e8d409f5e9bb4a3ef72125e08ae9a7bab4