Merge "Add batterystats -c data to telephony bugreports"