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

Change-Id: Ib5bd4eb953888da96be7dbee8ebaacb86e2e0a6c