Merge "BatteryMonitor: support battery health INCONSISTENT from health status"...

Merge "BatteryMonitor: support battery health INCONSISTENT from health status" into udc-dev am: e4b3b7b4

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



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