Merge "Add PhoneCapabilityChanged in phone state listener" am: ec67984561
am: 5f47241785

Change-Id: I151a1415dc90d66a4e60d7f997d73518bb5a90d7