Merge "Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread"...

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

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

Change-Id: I20bfd66287d903a812ebb0af5e5f2965f959674c