[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 01a1a1c2a0 -s ours am: 2f8b18593d -s ours am: 1d6d4f3c17 -s ours

am skip reason: contains skip directive

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

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