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: 1cd46449 am: bc97a7dd am: aedf162a

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



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