Merge "WriterTest: Add more tests" am: 61229d0878 am: d9dd2b4fc4 am: f8066cdabc am: 0dd5d1b371

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

Change-Id: I3fbce8b43b161bd4cae84e60eedc28926980148e