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