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

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

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