Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev