Merge "MediaCodec: more buffer state cleanup" into main am: edab2cea58 am: 8e8a3d5b55

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

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