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

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



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