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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a5943cddb0b26e4ee075153bb947a13beaa60fa