Merge "Devices without battery can report 0 voltage." into pie-cts-dev
am: 70d0c92123

Change-Id: I5d9ff5ef014ed7f72d17558916dbf49a9e323b02