Merge "Merge "CCodec: query api feature for block model" into rvc-dev am: 752adf7f1a am: 8a1325a680" into rvc-d1-dev-plus-aosp am: c382759fa0 am: 79f3668d6f

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

Change-Id: I1e1a5b908fbc4bad0a356d7352132fbc8b97ea89