Merge "A2DP: Prevent NPE in getDevicesMatchingConnectionStates()"