Merge "Add test for setDeviceConnectionState." am: a9c48964d4
am: 0a5910188c

Change-Id: I8c727b7afd683427b53df32485d564e8df39f118