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

Change-Id: I30bf3a4a9ab86fe1ac0f645b6b19e0d935e5b05b