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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca1386 -s ours am: d6d89e06 -s ours am: 4ffdc10d -s ours am: b4b91968 -s ours

am skip reason: contains skip directive

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



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