[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e264 -s ours am: 656eae1fb4 -s ours am: 1484088381 -s ours am: 0dd03d7cdb -s ours am: 653e3cbca4 -s ours am: 324de83349 -s ours am: 9e18501dc8 -s ours

am skip reason: contains skip directive

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

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