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

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

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