[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours am: 3f62d55bca -s ours am: c190f94b0f -s ours am: 6e7bc07852 -s ours

am skip reason: contains skip directive

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

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