Merge changes from topic "recovery-aidl" am: 18adf7deec am: c8abb3b4ee

Original change: https://android-review.googlesource.com/c/platform/system/libvintf/+/1906172

Change-Id: I05f6a60a7d84351cdf68c3aa1f22fd98bc8a9f27