Merge "Revert "Expand @FlaggedApi(FLAG) constants in API signature files"" into main