[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e264 -s ours am: 656eae1fb4 -s ours am: 1484088381 -s ours am: 0dd03d7cdb -s ours

am skip reason: contains skip directive

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

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