Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev