Merge "Lock in Surface#destroy" into tm-dev am: 15591134 am: a8b7ca65 am: 20d8acc8 am: b1bd4011

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



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