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

Change-Id: I5307bfb1a0cc22213e80e5bb2563d1a1a24c9292