Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d9f

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

Change-Id: I6c17d0bdb697ac2c3b2586b870498f048f58c3de