Merge "servicemanager: make recovery_available." am: f364c8d8f6 am: c9212ec27c am: 83aa6dabea am: 3a5c775df9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1891077

Change-Id: Ie1497f1bd80c30ff90ee15ba959ef7e120e3dd53