Merge changes I3828d4f5,Idabc0ad8,I7a0146e9 into main am: df5b37232a am: def46592d9

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

Change-Id: I8421cc6e2595e15f127424903df27d9a6046a8b1
Signed-off-by: Automerger Merge Worker <[email protected]>