Merge "A2DP: Prevent NPE in getDevicesMatchingConnectionStates()" am: 01ace75e9a
am: a7fee9d7c1

Change-Id: I4a2ef860ebc8f5d98cce024d312fd866dd9535bd