[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours am: d6d89e064c -s ours am: 4ffdc10d06 -s ours am: 45883820c0 -s ours am: 8e03084489 -s ours am: ee388176ed -s ours am: afb94ed83b -s ours am: 4614a70e05 -s ours am: f9cf24797c -s ours

am skip reason: contains skip directive

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

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