Merge "composer: update VtsDisplay dimensions" am: fc67ba997e am: 57986866c5

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

Change-Id: I2fd57aaa0804458fcde33dcaa39fb38e4d4d1cee