Merge "Remove lock when calling Surface.destroy" into tm-dev am: 38683625 am: 42dee93b

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



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