Merge "Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a28f am: bbc581b794" into tm-d1-dev-plus-aosp am: 1365747bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152523 Change-Id: I67f43519d4b72c66e44861d2c451baa38828d7dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: