[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: 01a1a1c2 -s ours am: 2f8b1859 -s ours am: 1d6d4f3c -s ours am: 48ee487e -s ours

am skip reason: contains skip directive

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



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