[automerger skipped] Merge "RELAND MediaCodec: don't cache buffers until requested" into stage-aosp-master am: 70de51b9 -s ours

am skip reason: Merged-In I6892f02853f00c3e355c827ec943fbdf183469f1 with SHA-1 0e2297b7 is already in history

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



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