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