[automerger skipped] Merge "libbatteryservice_headers: recovery_available" into stage-aosp-master am: f3aff3c17c
am: 9bd6b8147b  -s ours

Change-Id: I08d3bb58a3a4234edcb159360f205ed974b34b55