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

Change-Id: I8a49f926c171588d27dca44463c58c7398566935