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

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

Change-Id: I1dd9ef03633e550dfce4e171ef840e1fe65cb9da