Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a2 am: e8bffd4d am: 8ebabfb3

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



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