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

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

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