Merge changes from topic "batteryStateOfHealth" am: a358f7d2f1 am: be2e9bbbf9

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

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