Merge "Allow batteryChargeTimeToFullNowSeconds to be -1" am: 4e2d45ba53 am: 0d35a17357 am: 0a09e17cc1 am: 738df72fc7

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1436094

Change-Id: I0caa9ab29c8f4aaf911ef49bdf8e8eca1248b3e2