[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: 8c63e65e -s ours am: 8e0b505a -s ours

am skip reason: contains skip directive

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



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