Merge "libbatteryservice_headers: recovery_available" into stage-aosp-master