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

am skip reason: skipped by user hkuang

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

Change-Id: Ieeb3c76e5c532c8fa2286649f3f0c9bb7edb257c