Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev am: 9bdb06ab72 am: 18023a7c0e
am: 43c2df3ede

Change-Id: I4f5ad9a15171020ba04895570f8de5752d58f955