[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e2 -s ours

am skip reason: contains skip directive

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



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