[automerger skipped] Merge "MediaCodec: report message from CodecErrorLog" am:...

[automerger skipped] Merge "MediaCodec: report message from CodecErrorLog" am: c33f81ff am: 7778c72b am: e0cd633e -s ours

am skip reason: Merged-In Idd1adae38328ada955999a8cecb7ce14c75ea52e with SHA-1 cc1fb7b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407712



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