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

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

Change-Id: I5a77552a6776d8b74e39fadeba8e460074b274df