Merge "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH" into udc-dev am: a1e299b0

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



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