Merge "libhealthd.default: Mark as recovery_available." am: c07a66e169
am: d10362af98

Change-Id: I8da17037bfee4ed2021b72f008da2b03176b506a