[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f10 -s ours am: d9483b87bc -s ours am: 5c95074b1e -s ours am: 021ac5948a -s ours am: 8b00e9017c -s ours

am skip reason: contains skip directive

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

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