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

Change-Id: I7beaaea32a0dd27f8c7a8318914416886f21216e