Merge "Fix issue that music popped up from speaker during ringing call" am: de6924cdbc
am: e17943ed4b

Change-Id: Ie00c034a0c25920385511e93b2999e48173b1ad3