Merge "[automerger skipped] Merge "Merge "Merge "Merge "force g711 test to...

Merge "[automerger skipped] Merge "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" into android12L-tests-dev am: b67721f0 -s ours" am: e4ce4180

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



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