Merge "Trigger PhoneStateListener onCallAttributesChanged" am: cd4ca49b18
am: bbd7b9170a

Change-Id: Iefb3d9845b95e22f45ecfeb47f770b708951438a