[automerger skipped] DeviceStateMonitor and unit test polish am: d6455281...
[automerger skipped] DeviceStateMonitor and unit test polish am: d6455281 am: 7f14cc6a -s ours am: 2b74822d -s ours am: 0260bdab -s ours
am skip reason: Change-Id I987407ef812c83b10b84ba59c1f4010a0d27c143 with SHA-1 d6455281 is in history
Change-Id: I2b0f2ea52d6d2b01e4bf11e2fc34e5844b611e82