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

[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bc -s ours am: 87f01849 -s ours am: 2f8e1858 -s ours am: c28d2890 -s ours am: bb03e250 -s ours am: ec14fe95 -s ours

am skip reason: contains skip directive

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



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