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

Change-Id: I7f2840e00f6236ec1dd31e88140c9c55cfe2f072