[automerger skipped] Merge "composer: update VtsDisplay dimensions" am: fc67ba99 am: 57986866 am: 43869e93 -s ours am: bf9804c4 -s ours

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

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

Change-Id: I41b7ba4dfe958cd5f86e4746ed99be31bc1e0d37