Merge changes I37f968f9,I0e150c6f into android13-tests-dev

* changes:
  CtsVerifier / CameraOrientationTest: Ensure upright rotation is first.
  CtsVerifier / CameraOrientationTest: Ensure the preview and picture view have matching aspect ratios (x2).