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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e2 -s ours am: 656eae1f -s ours am: 14840883 -s ours am: 0dd03d7c -s ours am: 653e3cbc -s ours am: e3c543b3 -s ours

am skip reason: contains skip directive

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



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