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

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

Change-Id: I4bfb1a1478c4bec547d5a1bd1a999a75e5feacf4