Merge "Remove the per display window handles when the display is removed."...

Merge "Remove the per display window handles when the display is removed." into sc-dev am: 11b48770 am: 62cf33f6 am: 68f9e330

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

Change-Id: I9836120d0af16964cf02a4e048e70a187fc293c3