[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 97302388c9 -s ours

am skip reason: Merged-In I5e88e7a21d2a630f9d674c552afc9e1165092a41 with SHA-1 c514d4ee22 is already in history

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

Change-Id: If152ec71ee6765dc9c71c86cd6be0fbdd33efa30