Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into...

Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-d1-dev-plus-aosp am: de32fd8e am: b5a7f334

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



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