Merge "Fix NPE in CompanionDeviceServiceConnector" into tm-dev

        void onBindingDied(@UserIdInt int userId, @NonNull String packageName);

    }

    @UserIdInt

    private final int mUserId;

    @NonNull

    private final ComponentName mComponentName;

    @Nullable

    private Listener mListener;

    private final @UserIdInt int mUserId;

    private final @NonNull ComponentName mComponentName;

    // IMPORTANT: this can (and will!) be null (at the moment, CompanionApplicationController only

    // installs a listener to the primary ServiceConnector), hence we should always null-check the

    // reference before calling on it.

    private @Nullable Listener mListener;

    /**

     * Create a CompanionDeviceServiceConnector instance.

        if (DEBUG) Log.d(TAG, "onBindingDied() " + mComponentName.toShortString());

        if (mListener != null) {

            mListener.onBindingDied(mUserId, mComponentName.getPackageName());

        }

    }

    @Override

    protected ICompanionDeviceService binderAsInterface(@NonNull IBinder service) {