[automerger skipped] Support per-port display configs in VTS am: 821d5c05c2 am: 29d915f375 am: 3d978df32d -s ours am: 26421fe1a9 -s ours

am skip reason: Merged-In I92e1615d8eb9466b40e02f8e2df8b3432e927af6 with SHA-1 821d5c05c2 is already in history

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

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