Merge changes from topic "batteryStateOfHealth" am: a358f7d2 am: be2e9bbb am: f5d109ed am: bce26700 am: 35dead16

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



Change-Id: Ifcf301e59770d293d25e18d4e1b36775fb018263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>