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 am: bf3ffd0d

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



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