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

am skip reason: contains skip directive

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

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