DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is...
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found am: ce476bce -s ours
am: 278b965e -s ours
* commit '278b965e':
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
Change-Id: I6bcc41f6a5e8470f8ff514350d4043b3e4a08620