Merge "Remove connected device check logic in getConnectionState"
am: 8593fc6c06

Change-Id: I86b30d27d3d7ab35473e8710b100e5730dfa12a4