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

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



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