Merge "Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: 15f0a2590a am: 0238551d6d" into rvc-qpr-dev-plus-aosp am: 3bddffdd5c

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

Change-Id: I85637665073737c97b26171f0b66cd9792ec49ef