Merge "Add Battery time to location dumpsys" into pi-dev