Merge "MPEG4Extractor: support MPEG-H 3D Audio (1/2)" am: d7d1ca10be am: 59921f7788 am: 4969d96c75

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

Change-Id: Id920964fd9c3e56225229b7341277ee79317005c