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: 7a128615

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



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