Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev am: 4c7a5de957 am: 1ad77324aa am: 06f2489657

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2911485

Change-Id: Icd093b94a3026e494cc9bfc07dedf47eb077cbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>