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: 55a6b7cd am: b14e8b6e

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



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