Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev am: 4c7a5de957 am: b4fadec4ff am: bfc1a3394b am: 88b289d169 am: 53563f6131

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

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