Merge "Add a conditional wait for file switching in MPEG4Writer." into main am: 2e9ef55ed9 am: fd01094fc2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3142642

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