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

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

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