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

Change-Id: I94c30be53130d753719ea1b64dbdbaf272cd2265