Merge "Fix VintfObjectTest" into main am: 357237bf7f

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

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