Merge "Lock in Surface#destroy" into tm-dev am: 1559113427 am: a8b7ca659a am: 20d8acc8a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283681 Change-Id: Ifdb008214b4dc17930e682a1bbb96d721029a0b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: