Merge "MPEG4Extractor: support MPEG-H 3D Audio (2/2)" am: bb67898668 am: 54b061b245

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

Change-Id: Idba0439aa57f82cb8f51b68452dc7267ee2006a1