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

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



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