[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: 8c63e65e1e -s ours am: 8e0b505af1 -s ours am: b36e8b9d53 -s ours am: eb3eee1496 -s ours am: f0fde9b7af -s ours

am skip reason: contains skip directive

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

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