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

Change-Id: I89ce2407bb3ac648789b8c583e82106c07523b64