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

Change-Id: I91e0b067e313869417b8b18d9f65f8d0f2acc894