Merge "Merge "force g711 test to match 1-channel sample data" into...

Merge "Merge "force g711 test to match 1-channel sample data" into android10-tests-dev am: 031f612a" into android11-tests-dev am: 8cce7009

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

Change-Id: Ic62b233665d793aa2c28dde08f5926b01af9e332