[automerger skipped] Merge "BatteryStatsImpl: Add mBatteryTimeToFull to...

[automerger skipped] Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" am: dee14d2d am: b88e1801 am: 36053795 am: 05eef64c -s ours am: 87076c6b -s ours

am skip reason: Change-Id I844149d4787e3aef7808bb4f85b0f08d179c5c41 with SHA-1 3d4cba56 is in history

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

Change-Id: Ib65b2b8d46ab995bd3c8d749a05956bf53ae531a