Merge "Update battery health state intent (1/3)" into udc-dev am: 08ad2b77 am: e873c20a am: 0aa90618 am: 4dda56f4

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



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