Merge "Improve error reporting in MediaCodec" am: 4d0d3f9ff5 am: d1be6f1ffa am: 963fd0bddb

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

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