[automerger skipped] Merge "MediaCodec: add CodecErrorLog" am: 495816d5 am:...

[automerger skipped] Merge "MediaCodec: add CodecErrorLog" am: 495816d5 am: ed06cac7 am: 037698a4 -s ours

am skip reason: Merged-In I5ffccc5fcd75d5d2476ba15a438dddf2e5851f26 with SHA-1 9ce52c42 is already in history

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



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