Merge "Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread" into rvc-dev am: 9464091e am: f1102c8c" into rvc-d1-dev-plus-aosp am: 7e4773a9 am: ae3e7c70

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

Change-Id: I877295526909e6039ffb6e078b1e09ad65acf20c