Merge "Add permitted_packages to framework-crashrecovery" into main