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

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

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