Merge "Add battery stats to telephony bugreport" into pi-dev
am: 822482e72d

Change-Id: I9553a4ddff51b008bd7d2353be03c8fda2845dc3