Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" am: dee14d2d86 am: b88e1801bd

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

Change-Id: I70db8c89be99a8098058a67fb1a2a1d8aafb7201