[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours

am skip reason: contains skip directive

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

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