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

Change-Id: I7e5d90e1328c0b1165ca1229cc1dedc07d3517fe