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

[automerger skipped] Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" into rvc-qpr-dev am: 1c98cc28 am: e68ed780 -s ours

am skip reason: Change-Id I844149d4787e3aef7808bb4f85b0f08d179c5c41 with SHA-1 4b967a45 is in history

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

Change-Id: I35b8b07deeb15443904eb72a83ab43c74304fcbc