Merge "Add support for multi tracks in WriterTest and ListenerTest" am: 0eb4ef2828

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

Change-Id: I2dd5a0bb67fd8285ff5df440c94181d89b1d802b