Merge "Stop InCall Notification to avoid track leak" am: b47c9019b5
am: 1105966734

Change-Id: I367a09e58e6c651b7527f7a9ef2715bad79b5439