Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev