Merge "Revert "libandroid_runtime_vm_headers is recovery_available."" am: d69e2b3f13 am: 65f0c883ff am: d24e3c5c42

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1876123

Change-Id: I477f6b70db6143f12e202c2312efd98bbcf23564