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

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

Change-Id: I5881ac9d257181345481c0b04f25a00f95de2584