[automerger skipped] Merge "BatteryStatsImpl: Add parcel methods for...

[automerger skipped] Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-qpr-dev-plus-aosp am: 539e79f4 -s ours

am skip reason: skipped by user dplotnikov

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18974900



Change-Id: Id04049fe16c37f3694350ead01dc558527e13541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>