Merge "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH" am: 879629f9 am:...

Merge "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH" am: 879629f9 am: b958e8cc am: dcc553a7 am: 6a2dc1ee am: 7252ad40

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



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