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

[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f -s ours am: d9483b87 -s ours am: 5c95074b -s ours am: 9a9e9afa -s ours am: 659047eb -s ours am: 31d18d81 -s ours

am skip reason: contains skip directive

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



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