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

Change-Id: Ifc0d97ef6a65e8f3a3a6713848d116e68697b92e