Merge "libandroid_runtime_vm_headers is recovery_available." am: 4084f95dbc am: 3011d154c5 am: 3e7945e753 am: 5b454f7e58 am: ca6a67a46d

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

Change-Id: I02a2396566248aedf6aeac6c8f9d1cb457915564