Merge "Handle volume during incoming call ringing." into nyc-car-dev