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

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



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