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

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

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