Merge "Catch error thrown by WindowManager if window has already been detached" into tm-qpr-dev am: a79ea05f59

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

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