[automerger skipped] Merge "composer: update VtsDisplay dimensions" am: fc67ba997e am: 57986866c5 am: 43869e935a -s ours

am skip reason: skip tag Change-Id Ie2671e61498d2501901885b2a9986ee1974bd641 with SHA-1 bd7ea386c9 is already in history

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

Change-Id: Ie93eccee37230c41dd41ceed3a8a50ce0b2adb10