Merge "Revert "Migrate audioflinger package validation"" into main