[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bcb8 -s ours am: 87f0184973 -s ours am: 2f8e18583c -s ours am: 6107000711 -s ours am: aa318575a3 -s ours am: d01adee5f4 -s ours

am skip reason: contains skip directive

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

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