[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 -s ours am: d736f50d -s ours

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

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



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