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

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

Change-Id: I75fb9d71c08d93c168f23a8093ea39c18cb65672