Merge "libvintf_jni requires vintf" into main am: 45af28a30b am: 54a387fe57

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3093596

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