Merge "servicemanager: use recovery VINTF data." am: 4add08378d am: a89d35ded2 am: 70c4a6c8ae

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

Change-Id: Ia6e04a9ddc59121995f94ae835065ab027bbdc0a