Merge "Fix VTS PlaybackDataFlowWithTsVideoFilterTest sometimes failed." into android12-tests-dev am: 14ecb1c6a1 am: 9fc37c0d3c am: 6645a15ad5 am: d01eb42404

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

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