Merge "Reset callNetworkType and CallQuality after calls" am: 5819a3378d
am: dd0e480a7d

Change-Id: If8119dafb941ed449ab16a04702a42ee7ce74f84