Merge "Cleanup: move VINTF fragment into VAPEX" into main am: e8d679e223 am: 65a3102d41

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780410

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