Merge "[automerger skipped] Support per-port display configs in VTS am: 821d5c05c2 am: 29d915f375 am: d37b25fe2a am: 946b7f61c5 -s ours" into udc-qpr-dev-plus-aosp