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: 7b773f93 am: 98190d2f am: 8648caf0

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



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