Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into...

Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into android13-tests-dev am: ceeef2d2 am: d627f61e am: d565a1b9 am: dff7304e

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



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