Merge "Clean up KeepForWeakReference usage" into main

import android.view.DisplayAddress;

import android.view.DisplayEventReceiver;

import com.android.internal.annotations.KeepForWeakReference;

import java.util.HashSet;

import java.util.Set;

    private final DisplayModeDirector.Injector mInjector;

    @SuppressWarnings("unused")

    @KeepForWeakReference

    private DisplayEventReceiver mModeChangeListener;

    private final SparseArray<Set<Integer>> mRejectedModesByDisplay = new SparseArray<>();

    private Looper mLooper;