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: d1798b79

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



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