Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev am: 4c7a5de957 am: 1ad77324aa am: 1479889dc3 am: 173a33d3f5 am: 941b47c87a am: f5b9ba292e am: 646f5a416b

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

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