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: beab7489 am: f63256dd

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



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