Merge "Fix Issue in MPEG4 Append" into main am: bfc2e73d49 am: 1eea36c188

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

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