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

Change-Id: I8b95d85fa9f4fe88fba50086329fccb0f223016b