Merge "Listen to USER_STARTED instead of USER_ADDED from WebViewUpdateService." into oc-dev

                                    (intent.getExtras().getBoolean(Intent.EXTRA_REPLACING)

                                     ? PACKAGE_ADDED_REPLACED : PACKAGE_ADDED), userId);

                            break;

                        case Intent.ACTION_USER_ADDED:

                        case Intent.ACTION_USER_STARTED:

                            mImpl.handleNewUser(userId);

                            break;

                        case Intent.ACTION_USER_REMOVED:

                null /* broadcast permission */, null /* handler */);

        IntentFilter userAddedFilter = new IntentFilter();

        userAddedFilter.addAction(Intent.ACTION_USER_ADDED);

        userAddedFilter.addAction(Intent.ACTION_USER_STARTED);

        userAddedFilter.addAction(Intent.ACTION_USER_REMOVED);

        getContext().registerReceiverAsUser(mWebViewUpdatedReceiver, UserHandle.ALL,

                userAddedFilter, null /* broadcast permission */, null /* handler */);

    }

    void handleNewUser(int userId) {

        // The system user is always started at boot, and by that point we have already run one

        // round of the package-changing logic (through prepareWebViewInSystemServer()), so early

        // out here.

        if (userId == UserHandle.USER_SYSTEM) return;

        handleUserChange();

    }