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

[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bc -s ours am: 87f01849 -s ours am: 2f8e1858 -s ours am: 61070007 -s ours am: aa318575 -s ours am: 283bdb7b -s ours

am skip reason: contains skip directive

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



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