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

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

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

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

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



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