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

[automerger skipped] Merge "MediaCodec: don't cache buffers until requested" into tm-dev am: d7d0d4b1 am: 3d70ebf1 -s ours

am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 d59a075f is already in history

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



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