Merge "Merge "Increase battery stats job duration to 5 sec." into oreo-cts-dev am: 58943d91f8"