[automerger skipped] Merge "Add test for setDeviceConnectionState." am: a9c48964d4 am: 0a5910188c
am: 5f90ad4290 -s ours
am skip reason: change_id I14759daac6d3522fa133a6e3b27b3863bb4ce3d1 with SHA1 43848a5918 is in history

Change-Id: I8d1444e73ff227386a746816ef042e6838e5eef2