Merge "Add test for setDeviceConnectionState."
am: a9c48964d4

Change-Id: I94bb49aee91b1d72af90c211b6b8bc8b42878b58