[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bcb8 -s ours am: 87f0184973 -s ours am: 2f8e18583c -s ours am: c28d289065 -s ours am: bb03e250a9 -s ours am: ec14fe952e -s ours

am skip reason: contains skip directive

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

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