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: b996d724 am: 65fe4f77

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



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