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

Change-Id: I7de4d2ad24fd8d0de49fe80f4480791d34843829