Merge "Update battery health state intent (2/3)" into udc-dev am: 83de6311...

Merge "Update battery health state intent (2/3)" into udc-dev am: 83de6311 am: a8830ef2 am: 0de27e8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222



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