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

Merge "Codec2InfoBuilder: list FormatSurface for c2.android.* decoders" am: 2866355a am: 366a187d am: e3e4f94e am: e411b401 am: b269c499

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



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