Merge "Remove CheckBattery altogether" into stage-aosp-master
am: db436c7999

Change-Id: I65e49db994bbfe266772fa36ed97bee4e4468d5b