Merge "Revert "Unregister WindowInfosListener in destructor"" into udc-dev am: bb98b14b

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



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