Merge "Fix VintfObject to use vintf" into main am: f2c3583a5b

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

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