Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: 15f0a2590a

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

Change-Id: I346b0ff2ef76aa176d5a1f21cf8e98c29a88049a