[automerger skipped] Merge "Fix no sound with FDR-AX100 recorded 4k video" am: 1984ca703a am: 88ab23b385
am: 2b05ca3035  -s ours

Change-Id: Ia564f4d51ef526b9db5d7b7c7ed06a2589ea89d6