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

Change-Id: If54a195f2a3d5e3e40729c0e9217b56b0bf673e1