[automerger skipped] Merge "Merge "Remove stream_camera VDM flag" into...

[automerger skipped] Merge "Merge "Remove stream_camera VDM flag" into android15-tests-dev am: f748c172" into main am: 58cebdb8 am: a9ff3f01 -s ours

am skip reason: Merged-In Iedf68beb2a9f3003f675e125605facf8837dcb1b with SHA-1 604bf23d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3342523



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