Merge "Reset speakerphone at beginning and end of calls"
am: f2910c6993

Change-Id: Ide94b15965c0231291e993dd79fe99261283483f