Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread" into rvc-dev am: 9464091e72 am: 7f46d57c67 am: 91ecb004c3 am: c28ecf73f1

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

Change-Id: I43abd37a007a8411f017aa2d0ed759b217dc76cd