Merge "Remove dead window preservation" into udc-dev am: 4489eec9

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



Change-Id: I982c354771f3074bfd0f428bad7a3920dc261a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>