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

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



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