Merge "MediaMetadataRetriever: add static lock for image extraction" into main...

Merge "MediaMetadataRetriever: add static lock for image extraction" into main am: a90d4e8b am: 455ddffc

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



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