[automerger skipped] Merge "Add batterystats -c data to telephony bugreports" am: 289cf1ce14
am: 2be7049848  -s ours

Change-Id: Ia3d53b807943fd94b62ca1f109bf0c2a45013392