[automerger skipped] Merge "prepareInitialInputBuffer : retry buffers" into...

[automerger skipped] Merge "prepareInitialInputBuffer : retry buffers" into udc-qpr-dev am: 91bae53b am: b1063680 -s ours

am skip reason: Merged-In I6326c4c8542844cf7edb4c22054cc16a596c0af2 with SHA-1 ef235a9a is already in history

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



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