Merge "Merge "Revert "Call preserveSurfaces when detaching children."" into...

Merge "Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d am: c3e5f831 am: 564f07ab" into rvc-qpr-dev-plus-aosp am: e38482aa

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

Change-Id: I5de4027654565dd3569d39fbc8b35165e1ac0ba3