Merge "vintf recovery install parity w/ init_rc" am: ec71cbf0c8

Original change: https://android-review.googlesource.com/c/platform/build/+/1877977

Change-Id: I469d02a67f108bab09966adc447ea5430b5ffcaf