[automerger skipped] DeviceStateMonitor and unit test polish am: d6455281...
[automerger skipped] DeviceStateMonitor and unit test polish am: d6455281 am: 7f14cc6a am: f418e9f6 am: d1599a66 -s ours
am skip reason: Change-Id I987407ef812c83b10b84ba59c1f4010a0d27c143 with SHA-1 d6455281 is in history
Change-Id: I4f90c91d81cafd998aa482e79a29cdcc0a9dc385