Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev
am: 209175a2ab

* commit '209175a2ab0d6d8c27aed4fe4458c5f611004e3f':
  Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Change-Id: I502f0d40980f73a0180c60d3c1300506c00d60db