[automerger skipped] Merge changes from topic "upstream_next_vintf_v1" into main am: bafcb977 -s ours

am skip reason: Merged-In I843a24308a1653bff0b4842ff71e657304bea2c8 with SHA-1 6ea114dc is already in history

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



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