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

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

am skip reason: contains skip directive

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



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