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

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

Change-Id: I07b0c2b6027c5bed5775cebd4bda9dfa335d4e97