Merge "Avoid a NullPointerException in getDevicesMatchingConnectionStates"
am: 0b6f8f56d3

Change-Id: If06a07f579b974b92354fbbaa8e8e75a44ab31cd