[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours am: ff1266211f -s ours

am skip reason: contains skip directive

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

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