Merge "Fix deadlock in MediaCodec::configure when peek default mode is used"...

Merge "Fix deadlock in MediaCodec::configure when peek default mode is used" into tm-dev am: 97b67e31

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



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