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