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

Change-Id: I9df50b75871e1676c2841f05648accb7e1043bb3