Merge "MediaCodec: keep callback message for reclaim" am: c7baadb9f1 am: 50cd84961f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id21e6722564feebe49049f8444e9a57415970db6