Merge "Interleave buffers while sending to writer" am: e5c23c6911 am: 7b8c6947d2 am: 6f15fb209b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8668ab2ccef16e289f9e59e816e93ab2ce4e1852