Merge "Add a flag for APV support in mp4 writer" into main am: 6f770c6ce8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3329894

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