Merge "force g711 test to match 1-channel sample data am: ae55cbf717
am: 9956aa2874
am: eaf3f613a9" into qt-qpr1-dev-plus-aosp
commit
3dcd55bf8d