Merge "Revert "healthd: don't report fake data for battery-less devices""