Merge "Merge "Don't call startRinging twice" into rvc-dev am: 3fc1c56c91 am: d3f4152846 am: d49dc36462" into rvc-qpr-dev-plus-aosp