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

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



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