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

Change-Id: I01bdb85aac42abba59acd31722f50dc07934c9d8