Merge "Fix VintfObjectTest" into main am: 357237bf7f am: 3812ccf92a

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

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