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

Change-Id: I97342299680ab5e89ad6fb53c7a24c469c30a4d3