Merge "Add dumpsys support to DeviceStateManagerService."