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

Change-Id: I775f4447eec722507c7b1b6af1fe342f39f2bc66