Merge "Fix race b/w prepareInitialInputBuffers and...

Merge "Fix race b/w  prepareInitialInputBuffers and feedInputBuffersIfAvailable" into udc-dev am: 9f896f2f am: fd11cfce am: d00bf93a am: 3b5f346e

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



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