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 am: ff80ca93 am: 20a40648 am: 2cf9bd10

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



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