Merge "bootstat: battery test fails on QC devices"
am: 834e89c25a

Change-Id: I09dcbce33600fa9d2126300de10416400c82cb60