Merge "Defensively check for batterystats service instead of blocking to get it."