Merge "healthd: Fix negativity check after cast to unsigned enum" am: 3dad67af05
am: 4734981245

Change-Id: I77ec8aae517e4bd647a7dd6c87cb53152410e7c9