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

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



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