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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0317ea011c2c2e87ca0e5ee6ad7dcf174477743a