Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev