Merge "libbatteryservice_headers: recovery_available"