Also fixup comments to match recent changes in BatteryManager. Change-Id: I6f40924f9e66d564ad1175f9650e2bfd2ad39a3a
Change-Id: I089eb6348053a8a9c8bca59e57ed97b4af14825a