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

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



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