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

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

Change-Id: I2d49c2d1ba723f6a601a124bb09539648eae8702