Merge "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH" am: 879629f9eb am: b958e8ccc0

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

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