Merge "Ensure component helper is set before resolving activities."

    public Activity instantiateActivityCompat(@NonNull ClassLoader cl, @NonNull String className,

            @Nullable Intent intent)

            throws InstantiationException, IllegalAccessException, ClassNotFoundException {

        if (mComponentHelper == null) {

            // This shouldn't happen, but is seen on occasion.

            // Bug filed against framework to take a look: http://b/141008541

            SystemUIFactory.getInstance().getRootComponent().inject(

                    SystemUIAppComponentFactory.this);

        }

        Activity activity = mComponentHelper.resolveActivity(className);

        if (activity != null) {

            return activity;