[automerger skipped] Merge "Revert "MediaCodec: don't cache buffers until requested"" into tm-dev am: 84959301 -s ours am: 189d21d1 -s ours

am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 07358dfe is already in history. Merged-In was found from reverted change.

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



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