[automerger skipped] DeviceStateMonitor and unit test polish am: d6455281 -s...
[automerger skipped] DeviceStateMonitor and unit test polish am: d6455281 -s ours am: 9ef9d93a -s ours am: 0be514b4 -s ours am: 8a354e3d -s ours
am skip reason: Change-Id I987407ef812c83b10b84ba59c1f4010a0d27c143 with SHA-1 347835b6 is in history
Change-Id: I5c784bd1217b25b18ea6b1ce387a9047bb4114ea