[automerger skipped] Merge "BatteryMonitor: support battery health...

[automerger skipped] Merge "BatteryMonitor: support battery health INCONSISTENT from health status" into udc-dev am: e4b3b7b4 -s ours

am skip reason: Merged-In I8b944ddac7cc919fc95b1b71b015101642a62f96 with SHA-1 8231c3fe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23467711



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