Merge "Remove the per display window handles when the display is removed." into sc-dev am: 11b48770 am: 2c8a56b7

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

Change-Id: I13b977aa91eeb6421d55ae4cab2c2f35a9a75ef9