[automerger skipped] Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." am: 4a0a36425a am: 405eaf10dc -s ours am: 8cda3ad48a -s ours
am skip reason: Merged-In If74e285102a7350c17c2fc40a205b2031e82f5f4 with SHA-1 e57b8c1749 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2119445
Change-Id: If3c3e3b2bcaa3dece350c11786b0c1d14ecae588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: