[automerger skipped] RELAND MediaCodec: don't cache buffers until requested am: 4a114c2f9c -s ours am: 391bdcb8ec -s ours

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

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

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