Merge "codec2: fix CBR_FD framerate mode hook-up" am: 2c8f7f0270 am: d4ef5f41a6 am: 1e2405c101

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

Change-Id: I5e62f6f2e3d7cd917aaa4221482eac475a2ab88e