Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 am: ba28a3a57e
am: caa60f0b28

Change-Id: I810be1081f5d7687c4b00ac7168b2f5591a47965