Merge "Merge "Call preserveSurfaces when detaching children." into rvc-dev am: 5b72ddd8 am: 0be99525 am: ef62ca2f" into rvc-qpr-dev-plus-aosp am: 574f2c92

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

Change-Id: I607c51b6d532b7a342347b15332737a98a48860b