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: Ie9bf3bf37b63695f8916d061423b6e639a3be5fb