Merge "Remove CheckBattery altogether" into stage-aosp-master