Merge "transcoding: Fix width and height in VideoFormatResolver format" into sc-dev am: 689264f9db

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

Change-Id: I7de53ed8ae07a1ca9a41fa751368fe3cbfadc2da