Merge "libandroid_runtime_vm_headers is recovery_available." am: 4084f95dbc am: 3011d154c5

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

Change-Id: Id63baff24b72da002cc06d64a50abc92effe68f2