Merge "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH" am: 879629f9eb

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

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