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

[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bc -s ours am: 87f01849 -s ours am: f9ce5085 -s ours am: 7f7c96a9 -s ours am: 654cbaa7 -s ours

am skip reason: contains skip directive

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



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