Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev am: 9bdb06ab72 am: 4f9e42c8c6
am: 251258ec40

Change-Id: Ie5792ab116a6ac4a84976454376bd6b7509f0892