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

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



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