Merge "Metrics: Log ACL and SCO connection state change" am: 66109d09ae
am: 580d47e452

Change-Id: I2e5840afecdd319827d2b419067a634c7c98a26e