Merge "The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200"
am: ac6175ee79

Change-Id: I3e2b8d078abcd414663f802afa1d3d6926e08247