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

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

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



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