Merge "Update language to comply with Android's inclusive language guidance"

            }

            mFocusedDisplayId = displayId;

            // Sanity check

            // Find new focused window and validate

            sp<InputWindowHandle> newFocusedWindowHandle =

                    getValueByKey(mFocusedWindowHandlesByDisplay, displayId);

            notifyFocusChangedLocked(oldFocusedWindowHandle, newFocusedWindowHandle);