Merge "Allow configuration of which package to handle FACTORY_RESET intent."