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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e659 -s ours am: fcec28ee -s ours am: 08af1350 -s ours am: 7d4805ed -s ours am: 678a31c3 -s ours am: 6338b152 -s ours

am skip reason: contains skip directive

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



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