Merge "Merge "Ensure that two threads cannot simultaneously close...

Merge "Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a2 am: bbc581b7" into tm-d1-dev-plus-aosp am: 1365747b am: 64f2f1b1

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



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