Merge "Use the correct package name for CHOOSER"

     */

    public static final String ACCOUNT_TYPE = "com.android.keychain";

    /**

     * Package name for KeyChain chooser.

     */

    private static final String KEYCHAIN_PACKAGE = "com.android.keychain";

    /**

     * Action to bring up the KeyChainActivity

     */

            throw new NullPointerException("response == null");

        }

        Intent intent = new Intent(ACTION_CHOOSER);

        intent.setPackage(CERT_INSTALLER_PACKAGE);

        intent.setPackage(KEYCHAIN_PACKAGE);

        intent.putExtra(EXTRA_RESPONSE, new AliasResponse(response));

        intent.putExtra(EXTRA_HOST, host);

        intent.putExtra(EXTRA_PORT, port);