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

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

Change-Id: I2771c8174313ee364a95ec55a7eec69a58944346