Merge "Fix VTS PlaybackDataFlowWithTsVideoFilterTest sometimes failed." into tm-dev am: a71fffd754 am: 2ef9a1554c

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

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