Merge "force g711 test to match 1-channel sample data" am: eb98d9453c

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

Change-Id: I1822296cdd9622d747053dfe94d13b72eff50b02