[automerger skipped] Merge "RELAND MediaCodec: don't cache buffers until...

[automerger skipped] Merge "RELAND MediaCodec: don't cache buffers until requested" into tm-qpr-dev am: abba82cd -s ours am: 7c4c08a8 -s ours

am skip reason: Merged-In I6892f02853f00c3e355c827ec943fbdf183469f1 with SHA-1 32ffc779 is already in history

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



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