Merge "codec2: fix CBR_FD framerate mode hook-up" into sc-dev am: 61bece9e am: 78bc72d8 am: 58c2ae99

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

Change-Id: I0ea8d70ddd7afdfb5a4eb22589a57fb5794efd54