Merge "healthd: libbatterymonitor: recovery_available" into stage-aosp-master