Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into android13-tests-dev am: ceeef2d2bf am: d1798b790d am: a9f5ace3b6

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

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