Merge "MediaCodec: Pass missing C2Info for MediaCodecLinearBlock." am: 338f4e1d6f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517717

Change-Id: Ice1fbafbe0393972f8d4f1900c271f5a576f1bcf