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

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

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