Merge "Fix concurrency issue in shared mem allocator" into udc-dev am: 2fca0ca1

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



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