Merge "Lock in Surface#destroy" into tm-dev am: 15591134 am: a4844e15 am: 6f2d60a8

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



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