Merge "Camera2 CTS: Fix tests that assume matching sizes between formats" into lmp-dev