Merge "Unify user init logic in IMMS#onUnlockUser()" into main

            final InputMethodSettings newSettings = queryInputMethodServicesInternal(mContext,

                    userId, AdditionalSubtypeMapRepository.get(userId), DirectBootAwareness.AUTO);

            InputMethodSettingsRepository.put(userId, newSettings);

            if (!mConcurrentMultiUserModeEnabled) {

            // We need to rebuild IMEs.

            postInputMethodSettingUpdatedLocked(false /* resetDefaultEnabledIme */, userId);

            updateInputMethodsFromSettingsLocked(true /* enabledChanged */, userId);

            } else {

                // TODO(b/352758479): Stop relying on initializeVisibleBackgroundUserLocked()

                initializeVisibleBackgroundUserLocked(userId);

            }

        }

    }