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