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

[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6b -s ours am: 7ea8d848 -s ours am: 43473d14 -s ours am: f1cb5e82 -s ours am: a54bde04 -s ours am: ff126621 -s ours am: 514b9572 -s ours am: 0d1ed613 -s ours

am skip reason: contains skip directive

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



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