Merge "Lock in Surface#destroy" into tm-dev am: 15591134 am: a8b7ca65 am: 4c6707b9 am: 6e5bf66d

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



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