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

Change-Id: I7712a717995d5e702a186fe6c9762692ecb479b9