[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: 3294c98c -s ours

am skip reason: contains skip directive

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



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