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

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

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



Change-Id: Ib8499e11b31898e0c0595cc939fc2958ac4c8fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>