[automerger skipped] Merge "Add PhoneCapabilityChanged in phone state listener" am: ec679845 am: 5f472417 am: bccc6789 -s ours Change-Id: I1058a6797ff698fb9e4818773c9e04d81e6effb9