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

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

Change-Id: I2f479d18de7600d1d33d13362ad039c2fed67070