Merge "force g711 test to match 1-channel sample data" am: eb98d9453c am: 0db0cf02bf am: 77f3b24a43

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

Change-Id: I147bca5e19ad63d35603cc4e62146358ef9df7ce