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

Merge "Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d am: 37873794 am: 0e030685" into rvc-qpr-dev-plus-aosp am: b239ee42

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

Change-Id: I11ab66b0b6b58c4e43fd7b5568df66dd235de3c2