Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread