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

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

Change-Id: I7d447002a1a9e6c39d18cde59083bd0d152a855c