Merge "Codec2InfoBuilder: list FormatSurface for c2.android.* decoders" am: 2866355ac6 am: 366a187d80

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

Change-Id: Ibbeb1c1e066ac2b41a370539c7f85ac7937f1d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>