[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 skip reason: skipped by user hkuang

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

Change-Id: Iff638d749607d442bae49b773d9f08baa2615b9b