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

Change-Id: I36d7ddb836f4ded0c3261169bb298203e6b22884