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

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



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