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

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



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