Merge "Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: f5727d3efd" into rvc-d1-dev-plus-aosp am: f9fdae0b13

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

Change-Id: I90843864c7adf38b56a74717717c13ac2370cf00