[automerger skipped] Merge "transcoding: Fix width and height in VideoFormatResolver format" into stage-aosp-sc-ts-dev am: 412583055a -s ours am: 057c66be62 -s ours am: afb1fc5657 -s ours

am skip reason: skipped by user hkuang

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15695950

Change-Id: Ia792cd9201b1e3252f53925e60da257a0c1d52a9