Merge "Lock in Surface#destroy" into tm-dev am: 15591134 am: 62ccaabe

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



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