Merge "FocusResolver: Clean up focus requests and results when a display is removed" into sc-dev am: 831288d496 am: ce498e3e48

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

Change-Id: I4edca9c384139890aa505c414582184b26eda26b