[automerger skipped] RELAND MediaCodec: don't cache buffers until requested am: 32ffc779e2 -s ours am: 68aa1631ad -s ours am: 2e9d3e1c56 -s ours

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

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

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