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 am: aab602a1

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



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