Merge "Update battery health state intent (1/3)" into udc-dev am: 08ad2b77...

Merge "Update battery health state intent (1/3)" into udc-dev am: 08ad2b77 am: e873c20a am: 90432c41

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22730568



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