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

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

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



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