Merge "Fix C2StreamUsageTuning work for Linear Block model." am: 2485469ffd am: 7282609729

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

Change-Id: I6fec166a354bfa4f8a267d0c6fce74292683a3ba