Merge "[automerger skipped] Support per-port display configs in VTS am:...

Merge "[automerger skipped] Support per-port display configs in VTS am: 821d5c05 am: 29d915f3 am: d37b25fe am: 946b7f61 -s ours" into udc-qpr-dev-plus-aosp am: 51620d6c -s ours

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

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



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