Merge changes I9ccdbd8c,Ifc24ba37

* changes:
  Add onDeviceStateChanged() callback to DeviceStateManager.
  Fix DeviceStateManagerServiceTests and add to presubmit.