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

Change-Id: I1bf6b52a8a82ddc5880871344a8f5af53ebf8322