Snap for 8422005 from afdccf84fcf72672cedcc127d956e01f6472ad88 to tm-release am: 96bcbaf82b

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

Change-Id: Ibcc74a8464e828ecf5174703548ca5838cdf96cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>