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