Merge "healthd: don't report fake data for battery-less devices" am: ab26cc4b12
am: d9960d84d1

Change-Id: I30f0925d6b6f14d56197a52eb61e47fdc46d0af3