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

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

Change-Id: I3c55bbe0a23d0218563cc52f6c51f3f2045cd566