[automerger skipped] Merge "Add PhoneCapabilityChanged in phone state listener" am: ec67984561 am: 5f47241785
am: bccc67898d  -s ours

Change-Id: I1058a6797ff698fb9e4818773c9e04d81e6effb9